From 72c97f5cb477c3a61623b6d8aaad873c44da5d0a Mon Sep 17 00:00:00 2001 From: "djm@sportsman.spdomain" Date: Fri, 25 Mar 2005 02:19:24 +0000 Subject: [PATCH] bitkeeper revision 1.1236.1.128 (4243752c85MV0g7IdVNPy6olC7dJjQ) Turn on (and fix) do_initcalls so page scrub init is called... otherwise page scrub softirq causes null pointer deref --- xen/arch/ia64/xensetup.c | 9 +++++++-- xen/include/asm-ia64/init.h | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/xen/arch/ia64/xensetup.c b/xen/arch/ia64/xensetup.c index f16135da06..babf560ba4 100644 --- a/xen/arch/ia64/xensetup.c +++ b/xen/arch/ia64/xensetup.c @@ -140,7 +140,12 @@ xen_find_first_hole(u64 start, u64 end, void *arg) return 0; } - +static void __init do_initcalls(void) +{ + initcall_t *call; + for ( call = &__initcall_start; call < &__initcall_end; call++ ) + (*call)(); +} void cmain(multiboot_info_t *mbi) { @@ -240,7 +245,7 @@ printk("About to call ac_timer_init()\n"); ac_timer_init(); // init_xen_time(); ??? schedulers_start(); -// do_initcalls(); ??? + do_initcalls(); printk("About to call sort_main_extable()\n"); sort_main_extable(); diff --git a/xen/include/asm-ia64/init.h b/xen/include/asm-ia64/init.h index 8f1e764080..e828ab6d85 100644 --- a/xen/include/asm-ia64/init.h +++ b/xen/include/asm-ia64/init.h @@ -16,7 +16,7 @@ #define __initsetup \ __attribute_used__ __attribute__ ((__section__ (".setup.init"))) #define __init_call \ - __attribute_used__ __attribute__ ((__section__ (".initcall.init"))) + __attribute_used__ __attribute__ ((__section__ (".initcall1.init"))) #define __exit_call \ __attribute_used__ __attribute__ ((__section__ (".exitcall.exit"))) -- 2.30.2